applied patch from Mark Tiefenbruck to add missing return_if_fail,

Fri Jun 22 00:34:34 2007  Tim Janik  <timj@gtk.org>

        * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_xdisplay): applied
        patch from Mark Tiefenbruck to add missing return_if_fail, #449862.

svn path=/trunk/; revision=18215

diff --git a/ChangeLog b/ChangeLog
index 8089636bd46826be5cbd4029fea356ac1ade8303..c52281839ced73d388b482dea8f935710136f1cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 22 00:34:34 2007  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_xdisplay): applied
+       patch from Mark Tiefenbruck to add missing return_if_fail, #449862.
+
 2007-06-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c: Remove debug spew.  (#449492, Christian Persch)

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index de7c1f2f8336f14af6f7f4528f2b24a19167fae4..89aedfa3f2df224bdfb12280e705a7fd7dbac340 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -896,6 +896,7 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
 Display *
 gdk_x11_display_get_xdisplay (GdkDisplay *display)
 {
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   return GDK_DISPLAY_X11 (display)->xdisplay;
 }